extensionSystem: Remove the two-step initialize

Initially, extensions were loaded after they shell had fully created
the session and all objects, but this didn't allow extensions easy
ways to monkey patch prototypes, as most functions had already been
bound. Remove the historical vestigal function, and just merge the
two together.

https://bugzilla.gnome.org/show_bug.cgi?id=677586

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 35b02a4829fd8ccff7c3b55bae32312719ff9d1e..c33162d4db148f4f8b4d9cb5edce074b9b363fbf 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -239,12 +239,10 @@ function onEnabledExtensionsChanged() {
     enabledExtensions = newEnabledExtensions;
 }
 
-function init() {
+function loadExtensions() {
     global.settings.connect('changed::' + ENABLED_EXTENSIONS_KEY, onEnabledExtensionsChanged);
     enabledExtensions = global.settings.get_strv(ENABLED_EXTENSIONS_KEY);
-}
 
-function loadExtensions() {
     let finder = new ExtensionUtils.ExtensionFinder();
     finder.connect('extension-found', function(signals, extension) {
         loadExtension(extension);

diff --git a/js/ui/main.js b/js/ui/main.js
index 35c47deb1d7fc2dd80d6967431def78be41bbeaa..4248ab9cd151b85ce61fa438b3b3dc99c2c3e04d 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -221,7 +221,6 @@ function start() {
                                                 false, -1, 1);
 
     if (sessionMode.allowExtensions) {
-        ExtensionSystem.init();
         ExtensionDownloader.init();
         ExtensionSystem.loadExtensions();
     }